From c6dc19ce3ebccf61c81e0895f3f60bf019bb6f62 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Fri, 6 Sep 2019 15:06:05 +0100 Subject: [PATCH] debian-hardened-buildflags-CPPFLAGS Gbp-Pq: Name debian-hardened-buildflags-CPPFLAGS.diff --- config_host.mk.in | 1 + configure.ac | Bin 466444 -> 466584 bytes solenv/gbuild/gbuild.mk | 2 ++ 3 files changed, 3 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index 74ed02f23d2..f41df4c2d52 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -83,6 +83,7 @@ export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@ export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@ export CPUNAME=@CPUNAME@ export CDEFAULTOPT=@CDEFAULTOPT@ +export HARDEN_CPPFLAGS=@HARDEN_CPPFLAGS@ export CROSS_COMPILING=@CROSS_COMPILING@ export CURL=@CURL@ export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@ diff --git a/configure.ac b/configure.ac index 91029d4c13a6be8c034363683e84b3e2bad0e71a..7ce1833d57baef79acec0140e113025ccf7432a6 100644 GIT binary patch delta 168 zcmeC#BQs;KOhXG}3sVbo3(FSPg8TKEX$mE&#U%>56$<*L#YOr_nR)st1=;DkNu`-N zDQP*0>BZIxB^jxCTnZ52;TYuN>KE@E5a8zH=pJmFfTmhOS2sPiL;)tRU}UGCl3J#p mSDKTPz?GKC<>(wA9O@Jtq5(FD3t>`w?tRwnx%b)T+W`Q%kvEqB delta 29 lcmbQSSEgr=OhXG}3sVbo3(FSPg8S`%?z3+HbDwRF9RR!N4N(99 diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 88904117200..6e6cc5a92f3 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -255,6 +255,8 @@ gb_GLOBALDEFS += \ ENABLE_LTO \ ) +gb_GLOBALDEFS += $(HARDEN_CPPFLAGS) + gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS)) # Common environment variables passed into all gb_*Test classes: -- 2.30.2